Kuan - Fixed bug 2541 & 2605