Ok finally fixed