merge changes, small fix