Fix the sticky problem for version > 17.1.