Fixes button highlighting