Fix for when CAP is disabled