#787 (maybe)

this may or may not address #787, but it doesn't hurt anything.