More accurate checks