fix remaining case