An attempt to fix issue#3368