Semi working single-stepping