Fix bug where peeking at work was broken
Support for grace-period