added workarond to template