Applied patch by Henner Kollmann fixing blocker issue