Fixed Issues on pivi.T