stuff, fixes #1