Fix for obanyc-2180, with less enthusiastic trace