Feature/bug2

@Blackbaud-JosephPoirier
Please code review