fixing status handling