Fix for #171

Fix for #171