fix both