bugfix for case mapping scenario