Fixes to line 129