Resolved bug #1