1. small fix after merge