Quick switch pool fix