New test and fix