Resolved bug #4