fix for filepath issues