Close #395 - work around trove quirks