Resolved bug #3