Fix limit support