Partial fix for ticket #448