BugFix: Oscope not removing correctly
Authored by: arcachofo 2018-02-09
Parent: [r314]
Child: [r316]
