fixed errors from Faizeen's 'fix'