resolution bug 15