Bug fix in forecast builder