thread minor fix, enabled_when