Closes #479