Resolved bug 1121