Fix for when CAP is not in use