Fixing template logic for pusher