FIX white spaces compability