solved bug 12