Issue 2647 fixed.