Should we check this a bit more aggressively?