Should fix some block collapse bugs