Fix for #163