this fix the problem to a certain degree