Issue 6789: First version working