Re: #596 confirmed fixed; small glitch remaining