Skip Commercial button last 5 minutes of show

The DVR works great, and for the most part the Skip Commercials button works very well too.
However, at the end of the show, maybe the last 5 minutes or so, the button shows up, but when I click on it, it doesn't skip AND there is no way to FF through the last pod of commercials.
I can pause, and play, and that's it.

Anyone else have this?
This is on an Apple TV, with my Mac acting as the DVR.

Thanks.

This is actually a bug. The skip button shouldn't show and this has been resolved in the beta.

Commercial skipping is disabled when the last block in the timeline is a commercial break. This is to avoid missing any content of the actual show that the commercial indexer might have missed.

Additionally, if you have edited the commercials manually, Channels will stop once it reaches that last commercial block.