Fixed merged bugs