Make it work with latest RBX