Partial fix for #157
Partial fix for #157

RITAccess/data-analyzer,RITAccess/Glance-data-analyzer,RITAccess/data-analyzer,RITAccess/data-analyzer,RITAccess/Glance-data-analyzer,RITAccess/Glance-data-analyzer