Fix for #174