fix
Fixes #1
Fixes #3
I said it fixes #3
This resolves #3