minor fix after merge