fix stuff improper