Fixing collapse behavior