Fixes #1 and #3.