Closes #575.