Fix for ticket:371.