Closes #477