Fix issue with skipping conditional blocks.