Issue #105 - Fixes issue with bulk uploader