Fix according to PR#8 comments