fixing whitespace issues in 1.8.7