Fixing collapse