Possibly stable fix