Resolved a minor bug #26