Feat/image fix