Fixed bug 3098