fix order of submit messages