Fix for working with latest Coq with polymorphism