patch 002 from rudiger