fixes, we need template support