Draft solution bug 1787