Fix ordering issue