Fix for crash on new images