This may be required also to fix the weird Edge bug