Fix for ticket #741