fixes #1, fixes #2