address issues raised by Tres Seaver at #884