Fixed bug with formatting