Fixed typo and ordering issue