patch 003 from rudiger