another bug fix
adding a support for multiple mapping