Fix Cap issue