fixed status issues