fixed RT#87598, and #87597