Finished fix for block sometimes collapsing each other