This bloats the code - can't it be added to the template?