Fixed #26. For multiple and single detectors.