Closes #598 by pulling the correct field from the API.
Merge commit '81471a8832def832cad027b3d4953bea114643e5' into HEAD