restoring fixes