Fix #993

Fixes errors in pull #995.