fixes #2 and fixes #2