Use Frank Trampe's fixed version