Fixed issue #1957: Fixed whitespaces