Kudos to Joël Falcou for helping out on that one.

Fix #936