Small merge bug fixed