a better locked status handling