Changes to prevent long log when make