Bug fix for #68