Fixes #96, #97