Model fix attempt