Fix for bug #
New entry for bug #2381