Temp fix for #82