Fixed wrong mapped 'T' and 'O' commands.