support generator. Fixes #487