Fix for #170