added fallback code