Fix Proc condition to work well