fixing to sandbox mode