Improve check
Fix tick check