fix($stickyState): squash this commit with fix for #27