added fallback checks