fixing many case