timob-14772: Detach fragment appropriately
Merge pull request #4718 from hieupham007/timob-14772

timob-14772: Detach fragment appropriately