Fixed conditions not updating issue #20