fixes #2, #3