Fix/sim usim problems

What happens if tap does not work at all? Infinite loop?