Fixed incorrect handling of whitespace