Quick fix attempt