One more fix wrt #30