fixed even more failures