Bug fix in repeat. Add nested properties