v1.7.1 fixing filepath handling