updated to avoid a lot of messages in log