Tweak suggested by LucidCrux and bugs--