fixed: Reverse path substitution (for some cases)