Work around messages from slave outside our control