Feature/bug4

@Blackbaud-JosephPoirier please code review