Fix #89
Update for #87
Test data for #87