Resolved bug 1084