fix toroplus?