Better fix for the filename vulnerability