addressing ticket https://www.assembla.com/spaces/glamwiki/tickets/120