Bug fix for unfinished block