fixes #130 (master)