Rethought last frame handling