a couple of tweaks, so that make test passes in case any body is playing along