fixed bug 1758