Previous fix incomplete