Fixed issue with filename fix in wrong order