fixing #158