Corrected bug from previous