Fixing part of #97