Fix/sim usim problems

Infinite loop?