Issue/pup 1369/followup fix to super bug