added fallback for modal issues