fix for collapsed blocks swallowing other blocks

Change-Id: I71c996463e8dafbb76955ea08da4bca0a3385d9e