Partial fix for building images