fixed issue related to unit variants