#19 Fixing broken build