new version , hopefully able to fix failure in test 19