Fixed typo and possible bug