Fixes #15, properly