Fixes to lines 87 and 88