Fix for Bug_159