Fix a bug that prevent proper handling of disabled nodes