Fix of the last fix. No more warnings?