#3362 attempt to fix