fixing some of the stickyness