cr fixes #3 - templates extend fix