properly chain heavisideUsers with other steps, close #2041