Adding fix for goformat