Fix of collapse - again