Fixes #1, fixes #2.