Fixes #2 fixes #3