Fixed problems with last merge