Fixed issue related to raw static storing