NXP-14836: Make grid more robust