Fix for correct status recognition