Fix Fatal Error bug from previous commit