Fix image building