Fix Image parsing