Bug fix with image handle drawing