Fixes 4
Fixes #2