support strategy 'n pass logic fix