Fix for #162