Quick fix 2