VCF Fix

Signed-off-by: Artem Godin <artem.godin@vaadin.com>