Possible fix for incorrect whitespacing