#191 extend delegate template to avoid duplicate mapper instantiation

Fix for #191.