Merge bug squashed