Quick fix part2