_.find first number instead of buggy || operator
rebuild
Merge branch 'pr/377'