fixes #129 and #138