Switched bool op to and. should closes #540