fix similar cases always