Fix for problem enable blocks

Follow up to issue #38 and PR #47
We need a test case around this. Otherwise we can re-introduce the bug this is fixing if the unless gets removed.