fixed errors introduced with last merge