Fixing issue with comments after nested properties