Quick fix (2)