Previous fix caused new bugs, so alternative fix for blocker sign

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>