fixed bugs, see #16