Fix weird with glitch
Fix block manager