Fix cap stuff again