minor fix according to comments