Bug map FIXED for VS