Fixed bug wiht capitalization