Fix for (2) and (3) in #97