Fixes #1, #3