Fixed Bugzilla - bug 2383