Fix for filepath