some simle fix