[gh-569] Closes #463.