Fixes #129, Fixes #130.