Fixed bug introduced with last merge