Merge "Fixed a visual stack collapsing bug"