JDP bugfixing