Fixes #2, fixes #1