Fixed bug: VARS-663