Fixes #40
fixes #39