Use proper cap check