check image value before attempting to clear
Merge branch 'develop'