Fixes #89, #95