This commit fixes #40

This commit fixes #40