Fixes #45 for ever and ever