Bug fix (null pointer with T11M061T