Improve frame limiter