fixed enough checks