Conditional fix
Merge branch 'conditional-for-no-feedback'