Fix custom sender