Fixing current_path naming bug in logic