Ensure the condition is available when querying for approval - fixes #1004

Signed-off-by: emanuele <emanuele45@gmail.com>