Fix related cases