Fixed bug with format