fix for issue #2535 and some whitespace to the previous commit