[BUGFIX] Respect removeTrailingSpaces correctly