fix create complex
Merge branch 'fix_create_complex' into develop