Avoid useless warning messages
Bug fix