[breaking change] gh-522

Closes #522