Corrected path handling