Resolved bug #50