Resolved bug #61