Fix for 585

Want me to try it with long idents, or will you?