[FIX] units can be null