Cap errors fixed