Issue #97 solution candidate