fixing skippable blocks logic