Fixed issue with usage outside the CP