Make previous fix also work on 1.8.7