Don't know if this fixes the problem