Small fix part 3