Fixes issues #121 and #122