Fix those with (21/25)

Fix those with