support generator. Fixies #487