Fixed a bug in previous merge