Changes made for PR #1334