Regression in dev code after reorganizing clips