Fix to stop #3 from happening