Fix for problem enable blocks

Follow up to issue #38 and PR #47