Fix cell assignment