fix 2 failure cases