Fixes to line 89