Fixing empty currentBlock bug