Fix #43

This should resolve #43