Fix concrete type issue SWC-497