did some robust fixes