Fixes #1, #4,