Bug fix in activity lockout