Resolved bug 1122