Fix for new trajectory namespace.