a workaround commit. CUSTOM_VAR removed