Fixes #121

Though I'm not sure about BC.