Capping correctly