MP1-2441 : some tweak