Fixes #3 properly