VIX-144: Copy and Paste Issue fix 2