Fix for latest OPAM