Fixing the limit bug