Issue #71 fix and simplification of code