Sandwich Sim: patch for the last patch :)

the last patch actually introduced a new bug, that one is fixed now