fixes #3, fixes #1