this was NOT a magical fix. I think some higher up changes need to merged in