bug fix to pull into its own PR