[REVERT] 2 previous revision, as it looks like that the fix causes more troubles than it resolve a problem