Bug fix related with #4866