Patch for the core file is attached.

Cheers, Henri