Bug fix to build