Fixed #4 Signal by type