(#60931478) Solve Image factory problem 

https://www.pivotaltracker.com/story/show/60931478