[AutoPaster] Better behaviour