fix constructor
Merge branch 'new_main'