Fix buff issue