Bug fix #2324