fixed
Merge branch 'refs/heads/hotfix-strangebug-w-images' into develop