Fix/4.0.x/forum 798