commit before fixing models