Use current_path
as a fallback for whenever_path
#729
Merged
current_path
as a fallback for whenever_path
#729