Fixed major  bug with Undo of Add/Block Command