Fix for the collapse issue