Fixes #153, #155