Fix ordering problem