Or issue 93 fix

please consider this change, tests seem fine.