improve generation speed
resolve warning