Fix for flicker on OLD style button click - closes #296