Fix circled situation