Fix for ticket 3469