Fixed bug introduced in merge