fix, and test again