Fix for None previous block