SWC-1601: use a different method for asking for the fixed token
Merge pull request #1102 from jay-hodgson/release-53

SWC-1601: use a different method when asking for the fixed token