Fixes #138 and #139