Fixed for new base image