Fix hardcoding Dimention limit