Fix those with (18/25)

Fix those with