Fixes #129, #130