Bug fix and whitespace