Quick fix wrong status