Fix issue related with #2227