Badge form correction

Fix #585