Bug fix #503