Closes [gh-477]