fixes #40
fixes #41