progress on ticket 18075