Resolved a focus bug