Resolved bug 1095