Status logic fix