fix removing file condition
Merge branch 'newissue' into develop
Merge branch 'develop'