Added image support bug correction