fixed mapping variable type errors