Added hack in a couple of more places