Properly handle System props with space, close #1044