Fixed bug with goformat