Patch 9.6 - Format fix