Attempt to solve Bug #2795. review @dinhviethoa

review @dinhviethoa