Bug fix

Fixed that bug, and reduced number of signals.