#293 handle nested entries