fixes in #47