Fixed submit problems