bugfix in mapping