Fix bug adding/removing blocks