This line and line 31 should be fixed too. Could you add those to this pull request?