Fix to bug with empty image values