Fixes #1, #2