Bug Fix: 5 For: Detector