fix and fixes #3