Fixed hopefully insert/delete template compilation (issue6)