Format bug fix