* took over changes for bug 42 since patch did no longer apply cleanly