Fix issue #1 and #3 both along.

Fixing issue #3 reactivated issue #1. This fixes both.