fixes #55 (finally)