Fix from Saito