Bug fix - closes #10