applied helmut's expand() patch