Fixed type conflict