Fix for issue 101

Fix for #101