Update fix as discussed on github.