Fixes ISSUE #xxx Changes: 1. 2. 3.