Fixing blocker bug, see the patch and lol