step into/over instruction did the wrong thing
thx to stativ for noticing (cherry picked from commit 841355ebe4e924a208846a06bb38adf24c392381)