status machine fixed