Closes [gh-456]