Fixing image question handling
merge