Fixed Space issue again