Fix bug on company waterfall