Fixes #37, although breaking the block is bad.