Incomplete implementation for #172