Fixed bug with wrong format