More fixes for Nalanda, to be released

This was fixed in a later commit.