More reliable and simpler fix that will not cause errors