Fix #255 properly for nested properties