upgrade fix as suggested by @brutasse