Possible stability improvement (hack)