Kuan- Fixed bugs 2597 & 2595