in response to bug #3384 I've applied a proposed fix that was under #3017 by Zoltan Prohaszka