Fixes for not to delete all files