I always teach 2 men drill first. If students do 2 men drills without partner, they will get solo form. So, if your form come from application, you will never have this issue at all.
Application:
Solo form:
Application:
Solo form: