In prod mode, add leading underscore check