Fix concrete type issue SWC-497
Merge pull request #360 from dburdick/release-1.22

Fix concrete type issue SWC-497