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

More sticky fix.