fix holdWhen