Fix Non-repeater blocks locking repeaters

Fixes #856