patch to improve mapping of classes to source files