Old version appears to work...