Bugfix further example mappings