Another bugfix in _current_path