Updated based on ticket 89.