Small bug fix to block mode