Fix for Bug-173