Format issue fix