Fixed bug introduced in last merge