fixed status check to be much faster