Possible fix for auto collapse