Fixed bug with capitalization