fix remaining cases