More sticky fix.
Merge pull request #439 from gsn/master

More sticky fix.