Fixed types bug