Fixed bug introduced by last merge :(