Fixing issue #137 at least mostly.