fixed small ordering issue