Partial fix for another reported bug.