partial fix: Ticket #636
merged with recent SignatureSB branch and removed output