Issue #264, fixing reviewing issues