Fix those with (17/25)

Fix those with