Fixed type bug