- Add Matthias Drochner for providing the patch to