fixed some failures #348