Fix for new Mahabhuta API