Fix for #161