more fixs