support generator. Fxies #487