fix integration from Vadim