defect- 13091433

@jbest84 Please Review