fixed bad settings
merge