Fix for OR problem cc @borismarin @adrianq @pgleeson