End the CJ32 nonsense