Use the correct data type.  Closes #634