LimitCalls fix