Add safety net for back-to-back calls, bump