Lines 448 & 207 fixed