I think I saw a commit the other day which may have fixed this. Does it still reproduce on current emacs-25 branch?