Add fix for ticket #560