Quick fix again