this fixes #12, #37