Fix/sim usim problems

You're right! I didn't see the return.