Holder pattern fix