Fix Svace issue - BUFFER_OVERFLOW