Order submissions

Fix #394