Fixed, now removes on exit!