solution for bug 308