ticket:10 signals fix