Fix invalid format usage - Phase#2