fixes #52 and #55