jury-rig broken sign mechanism

Should improve situation on #811