fixed bug 1080195