More work on that item bug