Correct grid ->figure relation