Fix those with (22/25)

Fix those with