Previous fix part 2