other fix for ordering violations