MInor improvement