WP-2177 Updated the order of weight