Fix image loading events
Merge pull request #1720 from tobytailor/master

Fix image loading events