This change was the cause of everything going screwy