[DEBUG] Switch flag with unelegant yes