context sensitive fix