Quick fix II