Submit problem fix