Fixed custom-signals