fixed issues on format