Fix image creation with tags