Resolved bug 1115