Fix bug in Format