Tweak which might fix *some* undesired behavior