Workaround for incorrectly parsing spaces in genericsSigned-off-by: Ross Allan <[email protected]> (commit: 97fd14a)