second attempt to fix the double nested optional objects