Fix race condition for fluid layout