fixed Type handling