Fixed Black Box Defect #18