fix check on existance
Merge branch 'develop'