Fixing more problems with multiple signals