Fix nil submission context. Fix #503