another stab at #1305