some fixes on on 154 fixes #383