Latest changes, still a pending bug