Fix for file extension removal