Fixes #108, #109