Resolved a bug