bug fix, and litle less freigth from gandal