Fixed bug with signals