Fix issue 2906

Re-submit of the patch for issue 2906
(`..../holders/...` directory being absent)