Bugfix with signals