Fix for ticket #4519