Fix a whitespace issue that result in null returns