Fix to prevent incorrect filename changes