Fix cell filling