Fix create-image issue