Fix for (1) in #97