fix up issue reported by Endre