Fixes to line 52