Last merge bug fix