Fixed bug #964 thanks to Marc Gronle patch