fixed bug in last merge