Better solution for limit/back bug