fix holder behavior