Fix Issue 544 - Format issue