optimize and fix