Additional fix to Metaviz for thread-safe