Fixes #40

#40