Fixes #109, #111