Pull request for Alarm JB 4.1.2 Fix

Pull request for Alarm JB 4.1.2 Fix