Fixes #2 and fixes #5