solved bug 13