Add check for caps