Bug fix in master build