Fixed so different versions of extender can work together in harmony