bug fix in default mapping