Fixing broken build issue #583