fixing according to comments