Post-Refactor Bullet Limitation II