Closes #487