Modification for compatibility with Agora Project 2.16.3