ADDED fallback for header bug