working on #12
fixes #12