Tentative fix for immediate padding