Fix #1840 - Fix formating for type Java CP values