jdk

c208cfc5 - Bugfix and corresponding unit test