Issue #115 : add limitation to uploading events