Applying Chosen PR #1478