fixes #25 b, c, e issues