fixing issue #91: applying reviews #3