Fixed #40

Fix for #40