Fixes #1 - another fix, whoopse!