I believe this fixes #40