Fixed caps issue