add JustOneSpace support