Closes #485.